More fixes for 2007-08-21 merge conflict.
authorJuri Linkov <juri@jurta.org>
Fri, 24 Aug 2007 22:18:04 +0000 (22:18 +0000)
committerJuri Linkov <juri@jurta.org>
Fri, 24 Aug 2007 22:18:04 +0000 (22:18 +0000)
commitf672d84bf327fc8f06119465805d8f5de91cc1b9
treea5df31b23163a7a4e95161ad50c23ff2e5aeb03c
parentaf430622d9d4367432dda852a562394e870ce488
More fixes for 2007-08-21 merge conflict.
lisp/startup.el